build: Replace deprecated get_pkgconfig_variable()

Use get_variable(pkgconfig:...) instead.

diff --git a/docs/reference/meson.build b/docs/reference/meson.build
index 2e28fba4a8e43606a4ed3e1866314c2ce5fe70f8..d8c6fa9b5d6f7fee136eca534621ce076787b1e0 100644 (file)
--- a/docs/reference/meson.build
+++ b/docs/reference/meson.build
@@ -1,11 +1,11 @@
 if get_option('gtk_doc')
-    glib_prefix = dependency('glib-2.0').get_pkgconfig_variable('prefix')
+    glib_prefix = dependency('glib-2.0').get_variable(pkgconfig: 'prefix')
     glib_docpath = join_paths(glib_prefix, 'share', 'gtk-doc', 'html')
 
-    cairo_prefix = dependency('cairo-gobject').get_pkgconfig_variable('prefix')
+    cairo_prefix = dependency('cairo-gobject').get_variable(pkgconfig: 'prefix')
     cairo_docpath = join_paths(cairo_prefix, 'share', 'gtk-doc', 'html', 'cairo')
 
-    gdkpixbuf_prefix = dependency('gdk-pixbuf-2.0').get_pkgconfig_variable('prefix')
+    gdkpixbuf_prefix = dependency('gdk-pixbuf-2.0').get_variable(pkgconfig: 'prefix')
     gdkpixbuf_docpath = join_paths(gdkpixbuf_prefix, 'share', 'gtk-doc', 'html', 'gdk-pixbuf')
 
     docpath = join_paths(gtk_datadir, 'gtk-doc', 'html')

diff --git a/gdk/wayland/meson.build b/gdk/wayland/meson.build
index 1f0801fe439cfe68224824bc17a50785b9933bc4..d9ed7da3fc099bdbd0432e83f0de9aee2d772537 100644 (file)
--- a/gdk/wayland/meson.build
+++ b/gdk/wayland/meson.build
@@ -38,7 +38,7 @@ gdk_wayland_deps = [
 
 # wayland protocols
 wlprotocolsdep = dependency('wayland-protocols')
-proto_dir = wlprotocolsdep.get_pkgconfig_variable('pkgdatadir')
+proto_dir = wlprotocolsdep.get_variable(pkgconfig: 'pkgdatadir')
 assert(proto_dir != '', 'Could not get pkgdatadir from wayland-protocols.pc')
 
 wayland_scanner = find_program('wayland-scanner')

diff --git a/gtk/meson.build b/gtk/meson.build
index 79f4f0d234c70bfa37a73d21481ea9137c12daaa..a75a4f23548b7eca2f579aa6f62f067f0d712abe 100644 (file)
--- a/gtk/meson.build
+++ b/gtk/meson.build
@@ -847,7 +847,7 @@ gtk_deps = [
 ]
 
 if x11_enabled
-  x11_data_prefix = dependency('x11').get_pkgconfig_variable('prefix')
+  x11_data_prefix = dependency('x11').get_variable(pkgconfig: 'prefix')
 
   gtk_cargs += [ '-DX11_DATA_PREFIX="@0@"'.format(x11_data_prefix), ]
   gtk_sources += gtk_use_x11_sources

diff --git a/meson.build b/meson.build
index f2e63a865583de71c6ce4eeb6310d7beb30b00d7..3ba341d60af5a5a0593257862a20aa926dc69051 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -497,7 +497,7 @@ if tracker3_enabled
 endif
 
 if iso_codes_dep.found()
-  cdata.set_quoted('ISO_CODES_PREFIX', iso_codes_dep.get_pkgconfig_variable('prefix'))
+  cdata.set_quoted('ISO_CODES_PREFIX', iso_codes_dep.get_variable(pkgconfig: 'prefix'))
 else
   cdata.set_quoted('ISO_CODES_PREFIX', get_option('prefix'))
 endif